<<<<<<< HEAD
package xmqian.myapplication;

import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;

public class SoundActivity extends AppCompatActivity {

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.sound);
    }
}
=======
package xmqian.myapplication;

import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;

public class SoundActivity extends AppCompatActivity {

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.sound);
    }
}
>>>>>>> 12b9a08f9380bce72b8c6e055d4084faa0570803
